auto upstream
authorJoakim Verona <joakim@verona.se>
Fri, 14 Dec 2012 04:37:24 +0000 (05:37 +0100)
committerJoakim Verona <joakim@verona.se>
Fri, 14 Dec 2012 04:37:24 +0000 (05:37 +0100)

Trivial merge